Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Conflicts:
	lisp/ChangeLog

diff --cc lisp/ChangeLog
index fba541fbc298f156062084b202fc3e887616136d,679de0ce6aac28f9494ecb77d2bf552420e9e507..598f9c6a7202f881288ba2ccd28b178a2e0482e2
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
 +2015-01-11  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * files.el (directory-files-recursively): Do not include
 +      superfluous remote file names.
 +
+ 2015-01-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+ 
+       * net/eww.el (eww): Interpret anything that looks like a protocol
+       designator as a full URL.
+ 
  2015-01-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
        * net/shr.el (shr-urlify): Don't bother the user about